clean up code, remove old commented out code, try to keep lines at 80 chars, fix samtools issue