small changes based on lint