Updated layout (indents) & variable names