Cleaned up some loose ends