Ditch superagent, proper indentation, etc