Linting
Merge pull request #68 from michaeljoseph/linting

Linting