clean code, improve code