Cleaned up the style a bit.