Update, refactor and rebrand