Minor cosmetic changes, deleted orig file