Fixing issues with whitespace b/w literals and operators