Some clean code and development step.