Fix issues raised during code review
Sync. with the README