Refactoring + fix of '+2' error.