Refactor handler some