clean up a bit
clean up a bit