Moving helper functions in helpers.php and adding minor updates
Refactoring plugin