Refactor - Remove comments + improve intermediary function name