Removed db
Changed formatting