Some level 4 compliance. Refactoring.