Clean Code for issue #94