minor: rearranged some stuff