change format & variable names