improvements after review feedback