More improvements

Updated more of the style