Rearrange

cleaner this way