Some minor changes, added a comment to clarify things