identation cleanup and minor typos