Clean code #15