Design cleanup

Minor cosmetic cleanup