Clean code (v1)