small improvements followinf the code review