Cleanup/shorten this.