Small clean-up to reflect latest changes.
Merge pull request #1 from itdaniher/small_cleanup

Small clean-up to reflect latest changes.