Tidied some files up