Comments and reformatting