Cleanup per Kyle's and Timo's comments