Improve file name conventions and tidy whitespace