Tidied some stuff up.