removing irrelevant boiler plate code