verify that no unnecessary whitespaces are used

This change is also cleaning up all remaining whitespaces
to make the new validation method workable.

Change-Id: I15d288c5faa583aee8b4707b6a04ee2683326fe7