Refactoring
Improved scissor