fixed some spacing and removed  some imports