Remove duplication from Guardian

Just a small refactoring to start grokking the code base :smiley: