indentation fixed along with final changes