Tidying, adding docs