Addressed review comments + reverted some overlooked wrong changes