refactor submission formatting