minor code simplification