some s tyle changes