cleanup

a bit of cleanup