A few more style modifications