Move options closure to constructor
Only really needs to be initialized once