Refactor Advice modules