Refactor guard to soldier