#115 lint fixes