clean code, improve property naming
clean code, improve function and argument naming