Make the changes lint friendly