Fix whitespace errors and other's commented on the pull request