#1862 more style changes