general refactoring and branding