- Audited for 80 chars
- Removed some dead code
- Cosmetic changes