diff --git a/src/astrognome.c b/src/astrognome.c
index f95caa8..563e71f 100644
--- a/src/astrognome.c
+++ b/src/astrognome.c
@@ -295,12 +295,9 @@ free_planet_data(gpointer data)
 void
 print_house_cusp(gpointer data, gpointer user_data)
 {
-    gdouble *cusp = data;
-    gint *house = user_data;
+    GsweHouseData *house_data = data;
 
-    printf("House %2d..: %s (%f)\n", *house, signName[get_sign(*cusp)], *cusp);
-
-    *house += 1;
+    printf("House %2d..: %s (%f)\n", house_data->house, house_data->sign->name, house_data->cusp_position);
 }
 
 int
@@ -311,8 +308,7 @@ main(int argc, char *argv[])
         day = 11,
         hour = 23,
         min = 39,
-        sec = 34,
-        p;
+        sec = 34;
     double timezone = 1.0,
            lon = 20.766666,
            lat = 48.2,
@@ -403,8 +399,7 @@ main(int argc, char *argv[])
 
     swe_houses(te, lat, lon, 'P', cusps, ascmc);
 
-    p = 1;
-    g_list_foreach(gswe_moment_get_house_cusps(moment), print_house_cusp, &p);
+    g_list_foreach(gswe_moment_get_house_cusps(moment), print_house_cusp, NULL);
 
     printf("\nPLANETS AND POINTS\n==================\n\n");
 
@@ -413,8 +408,8 @@ main(int argc, char *argv[])
     printf("%s: %s (%f)\n", planet_data->planet_info->name, planet_data->sign->name, planet_data->position);
 
     planetInfo = g_new0(planetInfo_t, 1);
-    planetInfo->position = ascmc[0];
-    planetInfo->sign = get_sign(ascmc[0]);
+    planetInfo->position = planet_data->position;
+    planetInfo->sign = planet_data->sign->sign_id;
     planetInfo->house = 1;
     planetInfo->retrograde = FALSE;
     g_hash_table_replace(planetInfoTable, GINT_TO_POINTER(SE_NPLANETS + SE_ASC), planetInfo);
@@ -424,8 +419,8 @@ main(int argc, char *argv[])
     printf("%s: %s (%f)\n", planet_data->planet_info->name, planet_data->sign->name, planet_data->position);
 
     planetInfo = g_new0(planetInfo_t, 1);
-    planetInfo->position = ascmc[1];
-    planetInfo->sign = get_sign(ascmc[1]);
+    planetInfo->position = planet_data->position;
+    planetInfo->sign = planet_data->sign->sign_id;
     planetInfo->house = 10;
     planetInfo->retrograde = FALSE;
     g_hash_table_replace(planetInfoTable, GINT_TO_POINTER(SE_NPLANETS + SE_MC), planetInfo);
@@ -435,9 +430,9 @@ main(int argc, char *argv[])
     printf("%s: %s (%f)\n", planet_data->planet_info->name, planet_data->sign->name, planet_data->position);
 
     planetInfo = g_new0(planetInfo_t, 1);
-    planetInfo->position = ascmc[3];
-    planetInfo->sign = get_sign(ascmc[3]);
-    planetInfo->house = get_house(ascmc[3], cusps);
+    planetInfo->position = planet_data->position;
+    planetInfo->sign = planet_data->sign->sign_id;
+    planetInfo->house = planet_data->house;
     planetInfo->retrograde = FALSE;
     g_hash_table_replace(planetInfoTable, GINT_TO_POINTER(SE_NPLANETS + SE_VERTEX), planetInfo);
 
diff --git a/src/calculate.c b/src/calculate.c
index 227962a..2e8ceca 100644
--- a/src/calculate.c
+++ b/src/calculate.c
@@ -124,9 +124,3 @@ set_location_and_time(double lon, double lat, double alt, int year, int month, i
     return 1;
 }
 
-long int
-get_sign(double pos)
-{
-    return (int)ceilf(pos / 30.0);
-}
-
diff --git a/src/calculate.h b/src/calculate.h
index 91df42e..947473d 100644
--- a/src/calculate.h
+++ b/src/calculate.h
@@ -71,4 +71,3 @@ typedef struct {
 guint get_house(gdouble position, gdouble cusps[]);
 planetInfo_t *get_planet_info(int32 planetNo, double date, double cusps[]);
 int set_location_and_time(double lon, double lat, double alt, int year, int month, int day, int hour, int min, double sec, double d_timezone, double *jd);
-long int get_sign(double pos);