Code cleanup in DataAccess project