Cleanup
Minimalia
refactoring
Introduced security