cleaned up some vars