just some code improvements