Tidied up and added comments
uppercase consts