xda-one: minor refactoring