Refactoring of challenge project