xda-one: more minor refactoring