dos2unix
Code cleanup
More cleanup