Initial Code cleanup from Mac_Linux
Cleanup commit from Mac_Linux