refactor kicker