Extracted params and refactored common claim loading into a method call