Few code style updates