Linted
Merge pull request #106 from tsherif/linting

Linted