Tidying and docs