Cleaned up the code a little bit.
Striped down the settings file