Tidy up of some files.
Fix print macro: prints out $vars with value of 0 as "0" not blank.

Change-Id: I31ea9cfa0e39f66c518550db2bb440e28553c719
Signed-off-by: Stormrose <eturnerx@gmail.com>