Fixing some formatting to be the way I like it
Adding some comments