style fix/improvements