21 Days Ago
Merged shelved code review changes. Removed duplicated code.