Cleanup all code for consistency, and clarity.