refactor/comment for submission