Cleaned up redundant variables.