Add comments and fix whitespace