Work on clean code