added interface to make it easier to add more fake data for testing
minor cleaning and rearranging