Small improvements after review