Mild cleanups