Additional minor code reduction