cleared up some messy stuff