Varius correction and clean code