Slight refactoring. Make use of class variables