Code Cleanup, Config Added

Added config option to enable/disable the old ways