clean up
a little better