Code clean-ups and small re-factoring based on Nate's review

git-svn-id: http://kryo.googlecode.com/svn/trunk@371 a9660ef0-a895-11de-8ba5-91705c1537ed