minor indentation & other changes: