Tighten up the code.
6 files changed