Changes as per sindresorhus' comments