Tidied up some stuff

It is VERY clean now.