some minor code simplifications