Legibility improvements.Steps will be converted to functions.