FIX issues raises at code review
FIX issues raised in code review