adapted coding standard, refactored member variables and methods