Clean code some more