Refactored out settings handling
Cleanup crap