remove some boiler plate code