clean it up nicely to fit OMs