Some small improvements

- Renamed most variables (it's not done yet)
- Removed some unquote()-functions
- Added a few lines of comments