LUN-367: Code Review; Restructured Code Part 2.