Refactored MockupActivity