simplify things based on review feedback
4 files changed