Cosmetic

Add some comments, tidy up