Re-factored DBContext and plus some minor clean ups