Added some modifications of style