Cleaned up helpers.js