Refactor trait into class after all