rebranding
minor refactor