Tidying + correctness