simplify parsing
more cleanup
more concise logging