Minor code cleanups to comply with pr requests.