minor cleanup in all files