Removed use of given/when statements.