Tidied up some commenting