Add output to checksums, code cleaning