Basic cleanup. Uniform access principle, unneeded parens, etc.