code cosmetics - same order as in UI