Minor cleanup

just cleaning up some stuff before we move to the next phase of this project.