Tidied Up. Final Version