Work on cropping
Refactor
Rename service
Typo