Tidied up a little for main commit