Use newfound ninja skills to refactor stuff