Another test and clean up of comments for prep for bundling with Zap