lint fixes
merged master