Clean code #2