Minor cleanup (untested)