Made the changes requested by @JakeWharton