Code cleanup
Code cleanup
Code cleanup
Code cleanup
More code cleanup
Syntax cleanups