Addressed more comment changes