fixing refactor data