Take some lint suggestions