Added config file & continued cleaning up