Code review

Some code review