Code review

Added comments, tidied the code, commented out all methods