Addressed some whitespace issues as suggested in PR 1882