small improvements after review