Fixed indents and some formatting