General

• Fixed a crash caused by the DataTable being Garbage Collected
  Thanks to dean for finding this
• General code cleanup and refactoring