More linting and formatting
Merge pull request #115 from hfaran/hfaran

More linting and formatting