Feature/fix formatting

Do not merge -- based on previous pull requests.