h2o and slight reformatting