Cleanup general
Update general principles