Refactor to use text parameters instead of blocks
Refactor to use text parameters instead of blocks

Tidies up the code a bit, removing a number of unnecessary blocks.

ausaccessfed/saml-service,ausaccessfed/saml-service,ausaccessfed/saml-service,ausaccessfed/saml-service