working on cleaner database