Refactors based on comments from code review. Thanks to Aria in #node.js for feedback!