Cleaned up code that sets strategy and exceptions to use the available utility methods