Format changes, fixed indents