Tidied up some code and added comments