Updated to use table helper for result set formatting
Minor changes