Refactor syntax, variable names, ...