Address Pascal's review comments (PR#35)