Huge clearup for the db connection tutorial