Formatted and cleaned up imports