Some more commented code cleanup