Fixed spacing issues and comment formatting