refactoring, fixed metadata