[FIX] fixed some minor issues based on code review