Addressed github review