implement suggestions after review