refactored some class variables