Cleaned up DatabaseAccess class