More comments and reformatting