Address even more and more feedback comments