Continuing to refactor controllers and models