Minor corrections and code indentations