Simplify logic

Authored by apol on Jun 4 2018, 1:52 PM.