make it compile cleanly
clean up