Changes to pass Linter
Linted and reindented