Fixed some minor convention headaches with class code.