fix indentation and minor changes