clean code changes