More cleanups and style fixes