Clean  up
Various change