Style cleanups