General clean up

Indentation, comments, etc.
Continue with next user even if current had an error
get ALL the data