Fix option key
Add undent method
Use undent method
Refactoring