Clean up instantiation a bit