Refactor PREFIX