Tidying of DataAccessLayer