Refactoring and properties file cleanup