Merge pull request #33 from xujyan/jyx/cleanups

Some cleanups.