cleaning up some boilerplate code.