minor

a few more minor changes
got rid of a meaningless function