Refactor exercise fetching - #3