simple code improvements