lint/guidline changes