U/mjuric/dm 1219 style

Coding style fixups.