code improvements!