A little cleanup

Comments added as well