Cleaning up to Look and Feel a little.