Removed some unnecessary variable usage