Cleaning up some things for  better viewing experience.