Few comments added to Database and slight optimisation