Refactor per feedback for submission