Function-ized a few more methods