Neatening up for submission