Tidied some stuff up