Code shrink, tweaks.
2 files changed