Fixed a couple minor issues.
Optimized imports for the project