Fixing return issue
Linting fixes