Style changes

No logic is changed, just style/coding conventions.