Added slight changes in code style