Cleaned up project model