Reorder class X queries

Move class X queries to the top so the queries follow the
alphanumeric ordering in the ILCS.

Remove trailing whitespace.

Addresses #9