Cleaned up DataSource Code. Added Comments.