Tiny cleanup, add some more comments