Code cleanup (fewer console logouts).