Code cleanup

They are not serious but cosmetic changes.