code tidy, mobile improvements