make more functions sane
Merge pull request #6 from yetanotherhacker/cleanfuncs

make more functions sane