Small refactorings to the Submission class