Addresing code review by @dylans