typos + pep stuf
Reverted some change
Merge pull request #308 from samuelstjean/typo_csd

typos + pep stuf