Adding comments and basic formatting changes