Refactor somethings