Refactoring
Fix broken junk after refactor