Cleanup some leftover whitespace/comment changes