Cleaned up imports
Updated imports and cleaned jar