Some refactorings: because I enjoy to refactor