Tidying up API to suit our sample app