Changed indenting and added comments