More Functions, Some Clean Up