Cleaning code

Pair programming with @JurajKubelka