Clean up

Variables typically go at the top of a class...