Fixed findings from code-review.