Minor cleanup.
Merge pull request #198 from square/dimitris/minor-clean-up

Minor cleanup.