Cleaned up some vars