There were a couple spots that were calculating unused values. Moved them
to only be calculated when needed.