Fixed import matching

Also removed some extra spaces