remove comments, fix DBVariable class naming