Still fixing up the style