Spring Clean

Removed some of the non configurable variables and tidied up the code