fixed formatting
merged with ya boy dan