Refactor WRM controller duplication issues