More tidying and docs