removed Config file, added underscore and simplified some things