Refactored a few more subroutine calls that I overlooked