Cleaning up a little for #7