- Changed field names to make it password manager friendly
- More comments