Renamed lots of fields to avoid underscores
Introduce separate context auth method
Add newlines at many EOFs