Looks much cleaner.

Again, I really like the project and encourage you to dive deeper into progamming language theory.