Removed duplicate code
Cleanup
Added Cropping