OCD
prep for the 1.7 port mostly organization