just a little commenting and cleanup