Little refactoring

What do you think I must do to finish this pull request?