Addressed pull request review comments. cleaned up white spaces.