Major Cleanup
major clean up