Simplified some statements