Reformatted (and renamed) class definitions to look more Gnomey.