Tidied tomdoc commit