Update branding.

Adding back branding and code cleanup.