Removed whitespaces and unused import