cleaned up if/then logic. fixed Config.get()'s