Fixing Core -> Functions linting warning/errors