some clean code changes