First part of style fix