Some code cleanup, made DatabaseHelper a singleton.