Refactor Library