Removed debugging statements
Renamed data arrays
Removed layout specific code
Added filtering of income
Added more test data
Improved filtering