Refactor - Remove needless intermediary definition