Finishing up some clean up and restructure