Style cleanups, improve some messages