Improved coding etiquette in the file