Code cleanup on the Database package