Fixed  #13, some clean up