Fixed some issues when I pulled methods out