Commented some of my changes and more Code Formatting