further review polishes

* device style fix attempt (no debugging on device :()