Addressed review feedback