removed superfluous and confusing style