restoring unix line-endings, minor formatting