A couple of code smells
Another small code smell