Formatting and a paranoia check added.