Cleaned Up Code

Fixed some Formatting and Removed Unused Imports