some refactoring
added default properties file