Light cleanup of Console classes