Style cleanups and refactors