Code Review PR

This belongs in a helper.js file or something similar