changing some field and method names for better understandability