Addressed a few comments