fixed indent, fixed variable names