Added helpers module, refactored again