Took care of some style issues and removed some imports