AD VIEW: Code refactoring