Clean up non-AIC code changes.
Whitespace cleanup
Whitespace cleanup
Whitespace cleanup