updated style fixes from margs