Cleanup general
Add general principles