reduce method size
reduce method size