#434 Fixed comments and whitespace