Lint issues and removed console logging