Better row construction and general tidy up.