Cleanup: tiny little things

Little details add up!