Refactor / cleanup Controller trait