Added comments, alphabetized declarations for #332