Commented all of my code, minor refactoring etc.