fixed variable-/function-names and indentation