Formatting fixes (add attributions)
Trying new naming convention