Clean code (v2)