Minor cleanup

going to have a lot of refactoring to do.