Remove extra lines, fix indents