first stab at removing whitespace problems