Rename method to clearer previous name
Cleanup transformer and add specs