- Refactoring/commenting of submit code