Cleaning up facade a little.