some changes to indentation