Reorganize code just a smidge