Optimizing

NEW CHANGES
- Tweaks [Umer]
- Moved 'local' variables to their respective methods [Umer]