Helper added, code refactored