minor performance related reordering