Work on styles and format