applied some lint suggestions