Fix and clean code!