Cleaned some code up, removed unused imports