slight cleanup
more ideal structuring of wb table
reorganize for readability