clean code improvement