refactor to civic ninjas