Cleaned up requires