Refactored properties file (sort) and did code inspections.