Changes to device tree for better style