fixing lint errors with the exception of line length
Merge pull request #33 from Studyokee/lint

Lint
merge fix