Better use of DEBUG in main, consistent logical operators