minor code rearrange

deep breath - major changes coming