Cleanup for turnin
Touching up