Code cleanup, fixed some encoding errors, removed some InterWorx references.