Updated for lint errors