Removed an unneeded import and fixed tab-space mixing issues.