GH-5 Made minor changes to code style