Organized and removed unneccesary imports