Some cleanup

- Removed unused using statements
- Changed some variable names, for consistency