Remove double implementation (DRY)