removed unused import and fixed some whitespace inconsistencies