Cleaning up linter warnings in lib/core
Cleaning up more linter warning