[REFACTOR] bunch of polishes