Add const instance and tidy up

Gettings things ready for moving to core.