Some lint

Linted and modified some code