code cleanups

hey @sojoner - i like to chime in if that's ok :)
here's:
- stuff that I think is cleaner code
- immutable vs. unmodifiable collections