Cleaned up requires
Fixed incorrectly added module