fixed branding & cleanup