Removed use of given/when