simplify code

Authored by mvourlakos on Apr 13 2019, 8:53 PM.