SubmissionsController refactoring