Deep refactoring
Fix violations