Addressed IRC review comments