Litt refactor