cleaned up unused arguments
Merge remote-tracking branch 'upstream/master' into linting
changed indentation to 2 spaces.
Merge pull request #51 from kmpm/linting

Linting