Minor code cleanups.

Need to refactor a little at some point.
Working on accessible version of matching type

Not ready yet.