Addressed review comments 2.24, 2.26, 2.27, 2.32, 2.33, 2.36, 2.43