bit of cleanup, warnings