I have addressed the whitespace issues through all, and you will see them in next patch for the pull request