And removing an irrelevant comment ;)