Refactoring on finger end