small tidy-up move variables to top of class