Code cleanup & added config.properties