Added @andymckay for refactoring #860