New label stuff cleanup and re factoring