Refactoring for simpler compliance.