Refactor exercises so hints are simpler