Parsing Cleanup

Missed a few lines with my last commit...