Code: Cleanup and formatting.