Created mock data, did refactoring