Cleaned up loose ends