clean and idiomize