Cleaned up and all dependencies included