Cosmetic changes

Many function handles remain unused. I probably should delete them.