A bit of cleanup
forgot to commit for a while.