clean code, improve readability