file names to lower case and improved code style