Code Review

Using pull request for code review.