Converted environment properties to Java properties
Added comments