Code Review Feedback #76