refactored variables, classes and methods