Cleanup: coding style fixes