Style improvements (or so I hope)