Small refactoring of Submission
Merge pull request #2119 from bluerogue251/submission_refactorings

Small refactoring of Submission