Cleaned up import formatting