Some quick tidying