Tidied up some code

Because I was unneeded