Removed some unnecessary variables