Cleaned up and fixed for unix line endings