* More cleanup of Helper Module