Removed some singleuse variables