Corrected spacing, simplified code