Addressed some review comments