Reduced errors, cleaned git