Rename
Add tests
SF
Remove unnecessary object creation