Cleaned up a few loose ends