simplify based on review feedback