Code cleanup and bug fix in renderer.

Cleaned up code and fixed a bug that only allowed using two different
variables for the rules. For now it treats everything that isn't [,],+
or - as something that should render and move forward.