Cleaned up imports block