Correct Gerrit reported issues

Cleaned up white spaces reported by Gerrit.