Addressed review feedback from Luke