Separated some methods into their own file