Few tidy ups before planet submission.