refactoring: changed objects to tuples