Clean code version