refactor to nice ext format