Code Cleanup: Missed a few

Just a continuation of the other commit from before.