Refactor standardizer