fix according to comments in code review
fix spacing issue