Revised formating and indentations