small refactor controllers