Clean code again