fixed by review suggestions