Push all properties to properties file and simplify.