Moved the simpler transformers to just use where clauses

Moved the simpler transformers to use #where() clauses instead of transformers. This cut down on some code and made it a bit more readable.