updating style
many changes