Update whitespace/formatting/comments