General cleanup from previous commit

Housekeeping after all the restructuring from the previous commit.