edited more line endings and PSR-2 stuff