got rid of some boilerplate stuff