Code Review

Some code review improvements