Code/comment cleanup & fix line endings