refactoring of markup and variable names