refactor code
add tables definition
Merge pull request #1 from UWCSSA/zack

refactor code