Works on cleaning up and improving the database