Changes to code style as per review