Improved the style and stuff.