Code Review suggestions.