Coding Std, Cleanup, 50%

Cleaned up, and beautify. now at 50% (first 1000+ lines)