Removed whitespace, tweaked var output to be consistent