Some clean code step.