Refactored variables name