Some quick tidy up things