* more code improvements