fixed leak / small style changes