More clean up
Merge pull request #2 from ojwanganto/HOUSEHOLD-001

Household:More clean up