Syntax cleanup
Add tables support #3