Fix indentation, simplify parser somewhat