lint fixes and code cleanup