Make changes from @nickjs' feedback.