Refactoring the Initial Handlers