simplify after review feedback