minor code simplification
code backup; tired..