Code Review

Opening pull request to leave comments.