refactor :rainbow: