Minor formatting changes, added NUM_HOUSES constant