clean up/make generic