A little tidy, some nicer comments