Created constants class and tidied up other code/vars