Small tidy up to API and App