Now with styles and some cleanup