Cleanup + includes fixed