Minor code cleanup (only a few commments/prints removed)