Tidy up and use of class level variable