Final tidy
3 files changed