Address comments from @wasade