Integrating pull request feedbacks from bschmid