Continously improve my code craftmanship