Cleaning up for submission, part 1