clean up boilerplate