Code Review

yeah fixed this in my current branch.