Refactoring schedule app