Stable - code clean up, properties file