Fix the issues raised in review