additional style changes and improvements