some cosmetics and method changes