Added class variables to neaten code