Now with tidy
Better documentation