added Helpers.php, code cleanup