Comments updated and spaces removed