Fixing comments from @Snuffleupagus