more small cleanup

For your consideration...