Simplified code more