Minor cleanup while procrastinating