remove space from vars and procs

Change-Id: Ia7d5408f0f90e13860dc954ae5e2fe690fe343b8