Untested

Minor cosmetic issues