second attempt at fixing style