Code stylistic changes