Committing before refactoring Database.{h,m}