Fixed according code review