using conditional assignment to clean up control flow
minor cleanup
cleanup of update_status