got .properties file handling cleaned up