Few more style changes