simplify code

Authored by mvourlakos on Dec 1 2018, 3:11 PM.