additional lint friendly cleanup