Fix some comments and psr EOL