Few stylistic tweaks