minor changes, indentation