boiler plate clean up