add path variable and some whitespace fixes

Change-Id: I9cfd737b90ba7329e4aed123721e659531cd65ff