Clean-up line indentation and few typos