cleaned up some warts