Refactor commit
broken refactor