Minor fixes, spaces and indentations