Add additional comments and fix indentations