Code improvements.
2 files changed