Few code style tweaks