little code improvements