replace silly concatenates, more general cleanup
Merge pull request #10 from yetanotherhacker/splitem

replace silly concatenates, more general cleanup