Clean code 2