Style cleanups etc