Refactor for WPCS master rules