Tidy and enhance comments