improve mobile API

there are some unaddressed comments made in the MR review: !36 (merged)