Code styling tweaks