eliminate variable and further whitespace fixes