Addressed initial review comments