DRY and some mobile behaviour changes