Fix (oops), and cleaned indentations