Refactor somethings2